Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Wed, 6 Apr 2016 18:17:22 +0000 (14:17 -0400)
committerTom Rini <[email protected]>
Wed, 6 Apr 2016 18:17:22 +0000 (14:17 -0400)

Trivial merge